From: Dan Winship <danw@gnome.org>
Date: Tue, 15 Mar 2011 13:45:53 +0000 (-0400)
Subject: Revert "telepathyClient: remove alias-change messages, to unbreak string freeze"
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8317
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=72bee6d7ca2dd90c03bbb14ea1cd49408ab60d0b;p=gnome-shell.git

Revert "telepathyClient: remove alias-change messages, to unbreak string freeze"

Add this message back, now that master is no longer in string freeze.

This reverts commit f6cb215042db1404a8e5a3f694d23670ee23e370.

https://bugzilla.gnome.org/show_bug.cgi?id=642793
---

diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
index 0a3f6b724..33f4e8707 100644
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -521,18 +521,16 @@ Notification.prototype = {
     },
 
     appendAliasChange: function(oldAlias, newAlias) {
-        // FIXME: uncomment this after 3.0 string freeze ends
-
-        // oldAlias = GLib.markup_escape_text(oldAlias, -1);
-        // newAlias = GLib.markup_escape_text(newAlias, -1);
-
-        // /* Translators: this is the other person changing their old IM name to their new
-        //    IM name. */
-        // let message = '<i>' + _("%s is now known as %s").format(oldAlias, newAlias) + '</i>';
-        // let label = this.addBody(message, true);
-        // label.add_style_class_name('chat-meta-message');
-        // this._history.unshift({ actor: label, time: (Date.now() / 1000), realMessage: false });
-        // this.update(newAlias, null, { customContent: true });
+        oldAlias = GLib.markup_escape_text(oldAlias, -1);
+        newAlias = GLib.markup_escape_text(newAlias, -1);
+
+        /* Translators: this is the other person changing their old IM name to their new
+           IM name. */
+        let message = '<i>' + _("%s is now known as %s").format(oldAlias, newAlias) + '</i>';
+        let label = this.addBody(message, true);
+        label.add_style_class_name('chat-meta-message');
+        this._history.unshift({ actor: label, time: (Date.now() / 1000), realMessage: false });
+        this.update(newAlias, null, { customContent: true });
     },
 
     _onEntryActivated: function() {